Drop emacs23 icons to avoid future path conflicts

Thanks to Tatsuya Kinoshita for reporting the problem.

Closes: 841687

diff --git a/debian/rules b/debian/rules
index 8171720a5ca53952b29c70347e4c291437c7b4f3..38696d2076afbb44cc68cb55a566c639e992131c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -438,6 +438,14 @@ override_dh_auto_install: $(autogen_install_files)
          cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
            && convert hicolor/32x32/apps/emacs.{png,xpm}
 
+         # Remove emacs23 icon versions
+         cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+           && rm hicolor/*/apps/emacs23.*
+         cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+           && rm hicolor/*/mimetypes/emacs-document23.svg
+         cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
+           && rm emacs-document23.svg
+
          # Fixup image files in unversioned directories (version
          # unversioned images) and prepare for update-alternatives.
          cd $(pkgdir_common)/usr/share/icons/hicolor \